Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Jun 2011 08:12:23 +0000 (01:12 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 25 Jun 2011 08:12:23 +0000 (01:12 -0700)
commit5bde965a73827083cff9bdc3ee1e3adfcc73fc00
tree3229cd25872d05e0d776a436284dee77721f0321
parent2d7e212b68d18ba8cb907f5ea43df6e201e57f8e
parent636ead85d008f74c264519673611d6c82204870f
Merge from trunk.